Skia: hold image Blob alongside cached image shader - #77
Merged
Conversation
The cached shader references the image pixels without owning them (SkData::new_bytes), so keep the Blob alive for the cache entry's lifetime.
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
shader_from_image_brushbuilds the Skia image viaunsafe { SkData::new_bytes(...) }, which references the penikoBlob's pixel bytes without owning them. The resulting shader is stored in the generationalimage_shadercache, which outlives theset_paint_brushcall — so if the caller drops theImageDataafter painting, the cached shader dangles (UB).Fix: change the cache value from
Shaderto(Shader, peniko::Blob<u8>)and store a clone of the image blob (a cheapArcclone) alongside the shader, tying the pixel data's lifetime to the cache entry.Note: the cache key still ignores
brush_transform/sampler (audit item 1.2); that's a separate issue not addressed here.Link to Devin session: https://dioxus.staging.devinenterprise.com/sessions/b0ca09237beb462e9ea6b7be54018019
Requested by: @nicoburns